Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 31 May 2011 05:52:17 +0000 (22:52 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 31 May 2011 05:52:17 +0000 (22:52 -0700)
commita827fbf877d4e2030e04edd20a34582c46246d0a
treebe3e865a2c3d3732d174961009f9f5c0e567807e
parent5eb4b44d6292109f3d9ae2edbf045d402a4e7466
parent7fad7bd16ef5c02fc05a9003d110aeee45e89198
Merge from trunk.